From 2621041931347b0065b7b96d3d483849adb8771c Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 4 Jul 2007 23:31:56 -0700 Subject: [PATCH] Update for Emacs 22.1. --- debian/changelog | 6 ++++++ debian/copyright | 2 +- debian/dfsg-splitter | 6 +++--- debian/patches/avoid-fakemail-mail-loss.diff | 2 +- debian/patches/fix-vc-path.diff | 2 +- debian/patches/handle-dfsg-split.diff | 2 +- debian/patches/misc-unseparated.diff | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3fecde7ef7c..2386a1704be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +emacs22 (22.1+1-1) unstable; urgency=low + + * New upstream release. (closes: #427279) [rlb] + + -- Rob Browning Wed, 04 Jul 2007 23:05:33 -0700 + emacs22 (22.0.99+1-1) experimental; urgency=low * Update to 22.0.99. diff --git a/debian/copyright b/debian/copyright index c94fe0b5baf..bb566c6a421 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Tue, 16 Dec 1997 00:05:45 -0600. This is the original source archive: - prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.0.99.tar.gz + prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.1.tar.gz Please see /usr/share/doc/emacs22-common/README.Debian.gz for a description of the Debian specific differences from the upstream diff --git a/debian/dfsg-splitter b/debian/dfsg-splitter index cd2c9f0d93f..85d1b30e3be 100644 --- a/debian/dfsg-splitter +++ b/debian/dfsg-splitter @@ -7,9 +7,9 @@ set -x # run the script. The resulting two orig.tar.gz files will be placed # into a new ./split-tmp directory. -emacs_archive_name="emacs-22.0.99.tar.gz" -emacs_dir="emacs-22.0.99" -emacs_version="22.0.99" +emacs_archive_name="emacs-22.1.tar.gz" +emacs_dir="emacs-22.1" +emacs_version="22.1" emacs_major="22" deb_src_rev="1" diff --git a/debian/patches/avoid-fakemail-mail-loss.diff b/debian/patches/avoid-fakemail-mail-loss.diff index 864aba602d0..ba1f7641147 100644 --- a/debian/patches/avoid-fakemail-mail-loss.diff +++ b/debian/patches/avoid-fakemail-mail-loss.diff @@ -75,7 +75,7 @@ Index: sid/lisp/gnus/message.el =================================================================== --- sid.orig/lisp/gnus/message.el +++ sid/lisp/gnus/message.el -@@ -4027,7 +4027,12 @@ +@@ -4025,7 +4025,12 @@ "/usr/lib/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") diff --git a/debian/patches/fix-vc-path.diff b/debian/patches/fix-vc-path.diff index b0fb4d88d25..63bf516cb01 100644 --- a/debian/patches/fix-vc-path.diff +++ b/debian/patches/fix-vc-path.diff @@ -6,7 +6,7 @@ Index: sid/lisp/vc-hooks.el =================================================================== --- sid.orig/lisp/vc-hooks.el +++ sid/lisp/vc-hooks.el -@@ -73,8 +73,8 @@ +@@ -75,8 +75,8 @@ :group 'vc) (defcustom vc-path diff --git a/debian/patches/handle-dfsg-split.diff b/debian/patches/handle-dfsg-split.diff index f17bf9f86cd..c2477082c02 100644 --- a/debian/patches/handle-dfsg-split.diff +++ b/debian/patches/handle-dfsg-split.diff @@ -482,7 +482,7 @@ Index: sid/configure.in =================================================================== --- sid.orig/configure.in +++ sid/configure.in -@@ -3306,7 +3306,7 @@ +@@ -3305,7 +3305,7 @@ AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \ diff --git a/debian/patches/misc-unseparated.diff b/debian/patches/misc-unseparated.diff index d489b1b5261..53942daa822 100644 --- a/debian/patches/misc-unseparated.diff +++ b/debian/patches/misc-unseparated.diff @@ -59,8 +59,8 @@ Index: sid/etc/NEWS =================================================================== --- sid.orig/etc/NEWS +++ sid/etc/NEWS -@@ -38,6 +38,11 @@ - http://www.emacswiki.org/cgi-bin/wiki/PythonMode +@@ -35,6 +35,11 @@ + ** cua.el, cua-mode.el: remove old versions. +* Debian specific changes to Emacs -- 2.30.2